Skip to content

Conversation

@flobernd
Copy link
Member

As titled.

Related to #8496

@flobernd flobernd added backport 9.0 9.x Relates to a 9.x client version labels Apr 15, 2025
@flobernd flobernd merged commit 9d4467b into main Apr 15, 2025
23 checks passed
@flobernd flobernd deleted the adjustments-9.0 branch April 15, 2025 11:04
@github-actions
Copy link
Contributor

The backport to 9.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-9.0 9.0
# Navigate to the new working tree
cd .worktrees/backport-9.0
# Create a new branch
git switch --create backport-8497-to-9.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 9d4467be389e6ff0740e26593b6a9fcc1984bbdf
# Push it to GitHub
git push --set-upstream origin backport-8497-to-9.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-9.0

Then, create a pull request where the base branch is 9.0 and the compare/head branch is backport-8497-to-9.0.

flobernd added a commit that referenced this pull request Apr 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

9.x Relates to a 9.x client version

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant